Skip to content

Conversation

@aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origin/feature/q-inline-crossfile
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/q-inline-crossfile

@aws-toolkit-automation aws-toolkit-automation requested review from a team as code owners October 9, 2024 16:52
roger-zhangg and others added 26 commits October 15, 2024 15:55
## Problem
Need "go to console" links for explorer nodes and appbuilder nodes.

## Solution
- Needed to add to package-lock.json as added an API call to get CF ARN.
Had to call API instead of using the CloudFormationStackNode that
already existed because to do that, we would've had to filter through
all the stack nodes
- This currently does not support APIG consoles as the go/view link
apparently needs the arn/resource/method to properly route to an APIG
console.
## Problem
https://github.com/aws/aws-toolkit-vscode/blob/0164d4145e58ae036ddf3815455ea12a159d491d/packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts#L38-L39

This test is deleting my actual aws config file.

## Solution
Update the environment variable to point to a fake location before test
Then recover them after test
Today the we allow customers to select both inline and file options for
events to invoke their local function. This pr only allow one one event
type at a given snapshot of the config.
…down

## Problem
appbuilder walkthrough option should not exist in aws explorer dropdown

## Solution
Only exist in Appbuilder dropdown and in a new group
## Problem
Eliminate fs-extra from the codebase.

## Solution
We can use `fs.cp` since node v16.7.0+.
Note that `overwrite` is now `force` based on
https://nodejs.org/api/fs.html#fscpsyncsrc-dest-options

Bump the dependency @types/node to avoid casting (fs as any).
## Problem:

When a user does a sleep then wake of their computer, the heartbeat is
not up to date since it cannot be sent when the user's computer is
asleep.

Due to this there is a race condition on wake between the next fresh
heartbeat being sent versus when we check the heartbeats to determine if
they are stale (crash). If the crash checker runs before a new heartbeat
can be sent, it will be seen as a crash.

## Solution:

Use a TimeLag class that helps to determine when there is a time
discrepancy. It works by updating a state every second, and if we
determine that the next update to that state took longer than a second,
we determine that there was a lag. Then we simply skip the next crash
check, allowing a fresh heartbeat to be sent.

---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Signed-off-by: nkomonen-amazon <[email protected]>
Initial code for a rule engine to determine whether or not to show an
in-IDE notification. A notification is a JSON payload with a set amount
of criteria. The rule engine accepts context from the currently running
extension then determines if the notification payload's criteria will
fit the provided context.

The types match the commonly designed schema, but may change in future
commits.

Future work:
- More docs
- Updates to types and/or criteria
- Code that will use this

---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
See each commit message for revelant fix


---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Signed-off-by: nkomonen-amazon <[email protected]>
seshubaws and others added 28 commits October 30, 2024 10:04
## Problem
#4463

## Solution
The two required flags are set as follows:
- `__VUE_OPTIONS_API__`: `true` since we use the options API
extensively. This is opposed to the newer composition API, which I don't
believe we use. An example of us using the options API can be found
here:
https://github.com/aws/aws-toolkit-vscode/blob/f806ae04f5d56b872282e42d5f765b2b1a9e28dd/packages/core/src/login/webview/vue/login.vue#L321
and more info can be found here
https://vuejs.org/guide/typescript/options-api
- `__VUE_PROD_DEVTOOLS__`: `false` since this is the default, and it
otherwise increases the build size per
https://vuejs.org/api/compile-time-flags.html#VUE_PROD_DEVTOOLS.

## Notes
- Also relevant, composition API:
https://vuejs.org/guide/extras/composition-api-faq.html
- More detail on the flags:
https://vuejs.org/api/compile-time-flags.html#VUE_PROD_DEVTOOLS
## Problem
bot is adding unhelpful comments on Merge prs.

## Solution
skip Merge prs.
Problem:
- Contributors get confused about when to add a changelog.
- Bot adds two comments which could be combined into one comment.

Solution:
- Clarify the changelog note.
- Combine messages into one comment.
Allow users to View and Apply diff when they explictily send code to
Amazon Q using - Fix, Refactor, Optimize and Send To Prompt.

Notes:
- Releasing it all customers
- The View and Apply diff is only retained for first response after Fix,
Refactor, Optimize and Send To Prompt, and NOT for followup chats.
- `featureConfig` is the setup for A/B experiments and`Ignored` by
`tslint` because,
- currently View Diff and Apply Diff are the only feature that uses
these.
- If the changes are reverted the next time any team wants to use it,
they will have to rewire the A/B experiments setup again.
## Problem

QCT wants to support converting embedded SQL in Java apps.

## Solution

Allow users to start a transformation for SQL conversions.

---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: David Hasani <[email protected]>
### Goal:
We want notifications to do things when they are clicked on in the
[panel](https://taskei.amazon.dev/tasks/IDE-14932) or are received by
the IDE. These actions will must be able to be specified by the
notifications [JSON schema
](https://quip-amazon.com/nmB0AxFXuK3i/In-IDE-Notifications#temp:C:EMZ18c352ef42a546ebbe0f9e7c4).
We can update the JSON schema to handle certain actions if necessary.

1. Once received by the IDE, notifications should display a toast
notification. This toast notification should automatically be displayed
only once.
- We can track this in global state (see NotificationsController)
- This toast may shown a truncated form of the full notification text
(description in the schema). This truncation can be automatic or
provided by a new schema key, e.g. descriptionPreview.
- There should be an option to instead display this as a blocking modal,
for extreme circumstances only.
- This toast notification will not include any buttons, 
2. Clicking on the notification in the side panel will do 1 of 3 things:
- Open a url link
- Open a new text document with contents of description
- Open a blocking modal with contents of description and buttons
- The modal can display buttons, e.g. 'update and reload', 'open
external link', 'open in new text window', that perform different
functions respectively

### Results:

> Pop up toast notification on receiving a new notification
![Screenshot 2024-10-28 at 1 20
07 PM](https://github.com/user-attachments/assets/5960d7ee-2b90-47e6-b3b4-a5c8fa995064)

> Blocking pop up modal with options to restart and reload
![Screenshot 2024-10-28 at 1 17
47 PM](https://github.com/user-attachments/assets/a6e9f836-b350-4798-8596-69e3adccd0f0)

> Open URL link
![Screenshot 2024-10-28 at 1 18
32 PM](https://github.com/user-attachments/assets/e01be924-6b39-47c8-b194-1c64e740447d)

> Side view pop up read-only txt document
![Screenshot 2024-10-28 at 1 18
52 PM](https://github.com/user-attachments/assets/a540d01b-eae8-497e-a795-a03f5b096d06)
---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
This is a PR to upgrade LSP to 0.1.24, this LSP contains new APIs for
unit test generation.

## Solution


---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
…fig.toml #5913

## Problem
When customer choose use flag information from `samconfig.toml` for sync
and deploy operations, we assume that all the needed parameters will be
available in the `samconfig.toml`. Only `--config-file <samconfig file
path>` is passed to SAM CLI.

We skip many prompters in such scenario reduce clicking. Yet, we also
need to skip prompter for `ecrRepoUri` and `syncFlag` in sync wizard.

## Solution
Add condition to skip these prompter when flag information from
`samconfig.toml` is used.
## Problem
Explicitly specifying template path in sam deploy command to point to
the build artifact folder makes SAM CLI create/update `samconfig.toml`
in the build artifact folder rather than updating the `samconfig.toml`
file in project root folder.

## Solution
Remove the `--template-path` from deploy flag. SAM will determine the
template in the project folder and write to correct samconfig file
… sends in chat (#5898)

## Problem
- The examples text shows "How can Amazon Q help me?" but when you click
on it it shows "What can Amazon Q help me with?" in chat. This is
confusing to users

## Solution
- Align both the example help text and the prompt message in chat as
"How can Amazon Q help me?"

## Alternative solution
- Align them with "What can Amazon Q help me with?" instead
## Problem
We have no documentation showing what latencies we are measuring for
amazon q chat

## Solution
Add documentation
…5924)

## Problem

Recently noticed an issue where language upgrade transformations fail
when our `manifest.json` includes this new key which was added for SQL
conversions (unreleased feature).

## Solution

Use a default of `undefined` for `requestedConversions`, so that it does
not appear in the `manifest.json`, and only add it to the
`manifest.json` when the user is doing a SQL conversion, as this key is
only used for SQL conversions.

---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: David Hasani <[email protected]>
…-dev-server (#5923)

---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
There's nothing in this file

## Solution
Remove it
@justinmk3 justinmk3 closed this Nov 5, 2024
@justinmk3 justinmk3 deleted the autoMerge/feature/q-inline-crossfile branch November 5, 2024 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.